Merge tag 'upstream/0.1.12'

Upstream version 0.1.12

# gpg: Signature made Fri Feb 13 12:22:18 2015 CET
# gpg:                using RSA key 0x0612F4944ECDCD5A
# gpg: Good signature from "Matteo F. Vescovi <mfv@debian.org>" [ultimate]
# gpg:                 aka "Matteo F. Vescovi <mfvescovi@gmail.com>" [ultimate]
# Primary key fingerprint: 4E8E 810A 6B44 5FDE 68DA  D025 8062 3989 83B2 CF7A
#      Subkey fingerprint: F3DD 09F8 DA87 D1DF 5046  C99B 0612 F494 4ECD CD5A